package com.shibainus.hackathon;
//comment David 2

import android.os.Bundle;
import android.app.Activity;
import android.view.Menu;
import android.widget.Toast;

public class MainActivity extends Activity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);
        Toast.makeText(this, "Hello Will", Toast.LENGTH_LONG).show();
    }


    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        // Inflate the menu; this adds items to the action bar if it is present.
        getMenuInflater().inflate(R.menu.main, menu);
        return true;
    }
    //hello david and evan    
    
    //COMMENT COMMENT
    //another comment
    
    //comment evan 1
    //another stupid evan
    //comment will 1
    //comment dAvId #1
    // shibe is password
    //comment will 2
    // michael's conflict
    //even more conflict
    
    /*
     * How to resolve a conflict without the <<<<<<<<<<< .mine
     * 
     *  1. update
     *  2. it will tell you that there is a conflict
     *  3. right click the file with the conflict and chose team > synchronize
     *  4. go to the synchonize perspective
     *  5. right click the conflicting file and select edit conflicts
     *  6. if the conflicts are blue then you can use the right to left button
     *  7. if the conflicts are red then you have to copy paste stuff from right to left
     *  8. right click the file and mark as merged
     *  9. say yes to save
     * 10. then commit
     */
}
